renderer: implement native sRGB support #1687
Conversation
illwieckz
force-pushed
the
illwieckz/srgb-native
branch
2 times, most recently
from
c914db4 to
ce0a6e3
Compare
|
Hmmm… I don't know where to write the line |
You only really need to call it once, it's global state and will affect all sRGB framebuffers. |
|
Which framebuffer should be sRGB there? |
| @@ -972,6 +981,11 @@ static void ParseTriangleSurface( dsurface_t* ds, drawVert_t* verts, bspSurface_ | |||
|
|
|||
| cv->verts[ i ].lightColor = Color::Adapt( verts[ i ].color ); | |||
|
|
|||
| if ( tr.worldLinearizeLightMap ) | |||
| { | |||
| cv->verts[ i ].lightColor.ConvertFromSRGB(); | |||
There was a problem hiding this comment.
Does this need to be done for patch meshes as well?
There was a problem hiding this comment.
I may have forgotten patch meshes.
| tr.worldLinearizeLightMap = true; | ||
| } | ||
|
|
||
| if ( sRGBcolor && sRGBtex ) |
There was a problem hiding this comment.
Is there any reason to keep separate parameters for sRGBcolor and sRGBtex if they only ever take effect if both are true?
There was a problem hiding this comment.
They are separate options in q3map2. In fact it is hardly meaningful to have one and not the other, so we may add an extra test printing a warning and decide to do something as a fallback.
| @@ -707,6 +707,78 @@ void GL_VertexAttribPointers( uint32_t attribBits ) | |||
| } | |||
| } | |||
|
|
|||
| GLint GL_ToSRGB_( GLint internalFormat, bool isSRGB ) | |||
There was a problem hiding this comment.
Any reason why this is not in tr_image.cpp? All of the call-sites seem to be there.
There was a problem hiding this comment.
Can be moved elsewhere indeed. I just put it there because that was some kind of GL helper.
| } | ||
| } | ||
|
|
||
| GLint GL_ToSRGB( GLint internalFormat, bool isSRGB ) |
There was a problem hiding this comment.
This can just be one function rather than GL_ToSRGB() and GL_ToSRGB_().
There was a problem hiding this comment.
It would be much more wordy. It was a single function in my original branch, but I split it to make it less wordy.
| @@ -1761,6 +1761,11 @@ void Tess_ComputeColor( shaderStage_t *pStage ) | |||
| { | |||
| rgb = Math::Clamp( RB_EvalExpression( &pStage->rgbExp, 1.0 ), 0.0f, 1.0f ); | |||
|
|
|||
| if ( tr.worldLinearizeTexture ) | |||
| { | |||
| rgb = convertFromSRGB ( rgb ); | |||
There was a problem hiding this comment.
Should this conversion be done with other colorGen_ts as well?
There was a problem hiding this comment.
It has to be verified one by one. I went for the obvious ones first (and I'm even not 100% confident yet).
illwieckz
force-pushed
the
illwieckz/srgb-native
branch
from
ce0a6e3 to
387cac8
Compare
|
As a matter of fact, I have zero confidence this implementation is correct, unlike the GLSL alternative implementation. Said otherway, I know how to implement the whole computation myself in GLSL, but I don't know how to configure OpenGL to let it do the computation by itself without me writing the explicit computation. The GLSL implementation is a math algorithm, the OpenGL implementation is a puzzle. |
Implement native sRGB support.
Obsoletes #1543:
It includes the commit from #1686:
This is based on an even older branch from 2019 as I initially tested native sRGB support before attempting to implement it in GLSL.
I rebased on current
masterand merged improvements from thesrgb-naivebranch as it implemented more corner cases than this one.It still suffers from the problems I faced in 2019: 2D colors are wrong. I need help on that part.